Fix bounds violation. From Mottram.

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index dcd16f85524d2e1ea877df4e8663c84c589bb9c5..7069aa28de20acd0da01737a59163d6b3cad378f 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -147,10 +147,10 @@ my_fread4(void *ptr, FILE *stream)
 
 static 
 size_t
-my_fwrite4(void *ptr, FILE *stream)
+my_fwrite4(int *ptr, FILE *stream)
 {
        char cbuf[4];
-       char *cptr = ptr;
+       char *cptr = (char *) ptr;
 
        if (!endianness_tested) {
                test_endianness();
@@ -423,7 +423,7 @@ n = 1;
 static void 
 mapsend_route_hdr(const route_head *rte)
 {
-       int wp_ct;
+       int i;
        unsigned char c;
        char * rname;
        
@@ -441,13 +441,13 @@ mapsend_route_hdr(const route_head *rte)
        xfree(rname);
        
        /* route # */
-       c = rte->rte_num;
-       my_fwrite4(&c, mapsend_file_out);
+       i = rte->rte_num;
+       my_fwrite4(&i, mapsend_file_out);
        
-       wp_ct = rte->rte_waypt_ct;
+       i = rte->rte_waypt_ct;
 
        /* # of waypoints to follow... */
-       my_fwrite4(&wp_ct, mapsend_file_out);
+       my_fwrite4(&i, mapsend_file_out);
 }
 
 static void 

diff --git a/gpsbabel/reference/route/route.mapsend b/gpsbabel/reference/route/route.mapsend
index 2fd785eb1d4caf57695202d2f6d3b79430b21b5c..bd65116929f26f0189e10880e9151875e3edb1b5 100644 (file)
Binary files a/gpsbabel/reference/route/route.mapsend and b/gpsbabel/reference/route/route.mapsend differ